From: Keir Fraser <keir.fraser@citrix.com>
Date: Mon, 30 Jun 2008 09:02:21 +0000 (+0100)
Subject: tools/python: fix TypeError for 17903:0728459b3c8d
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14192^2~10
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=dd258ce6c05ebf242793751676de1136d519a2ee;p=xen.git

tools/python: fix TypeError for 17903:0728459b3c8d

If `hda' is used in domU config file and domain-0 has /dev/hda,
creating a domain failed by TypeError:

  File "//usr/lib/python/xen/xend/server/blkif.py", line 84, in
getDeviceDetails
    (device_path, devid) = blkif.blkdev_name_to_number(dev)
TypeError: unpack non-sequence

Signed-off-by: KUWAMURA Shin'ya <kuwa@jp.fujitsu.com>
---

diff --git a/tools/python/xen/util/blkif.py b/tools/python/xen/util/blkif.py
index 7e4bad5648..74935774a6 100644
--- a/tools/python/xen/util/blkif.py
+++ b/tools/python/xen/util/blkif.py
@@ -20,7 +20,7 @@ def blkdev_name_to_number(name):
     devnum = None
 
     try:
-        return os.stat(n).st_rdev
+        return (devname, os.stat(n).st_rdev)
     except Exception, ex:
         pass